Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(licenseinfo): Reporting Improvements #395

Merged
merged 1 commit into from
Dec 17, 2018

Conversation

dreh23
Copy link

@dreh23 dreh23 commented Nov 5, 2018

@maxhbr
Copy link
Contributor

maxhbr commented Nov 5, 2018

Please reformat the commit messages according to https://github.com/eclipse/sw360/wiki/Dev-Semantic-Commits

@dreh23
Copy link
Author

dreh23 commented Nov 6, 2018

#379

@maierthomas
Copy link
Contributor

thank you for this contribution.
Please resolve the conflicts and rebase your branch to the current master.
You can use the flag -i (interactive) to squash your commits.

@maierthomas maierthomas added needs code review has merge conflicts needs general test This is general testing, meaning that there is no org specific issue to check for labels Nov 6, 2018
@dreh23 dreh23 force-pushed the johannesamorosa/#380 branch 9 times, most recently from 7513181 to 746bb5a Compare November 8, 2018 14:00
@dreh23 dreh23 changed the title chore(licenseinfo): Add Editable Default Texts chore(licenseinfo): Reporting Improvements Nov 8, 2018
@dreh23
Copy link
Author

dreh23 commented Nov 8, 2018

#375
#377
#378
#379
#380

@maierthomas
Copy link
Contributor

@mcjaeger I could build this branch successfully with all tests.
Please consider to add maybe this java option -Djdk.net.URLClassPath.disableClassPathURLCheck=true in case of surefire build issues.
You can add the following env variable to your system:

_JAVA_OPTIONS: -Djdk.net.URLClassPath.disableClassPathURLCheck=true

Copy link
Contributor

@maierthomas maierthomas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In general the code looks good. Please have a look to my review comments and do some adaptations.


getJspContext().getOut().print(output);
}
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line break

Copy link
Contributor

@maierthomas maierthomas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

code looks good!

@dreh23 dreh23 force-pushed the johannesamorosa/#380 branch 2 times, most recently from 63545af to 8d62965 Compare December 4, 2018 13:50
@mcjaeger
Copy link
Contributor

mcjaeger commented Dec 7, 2018

Edit: It seems like I am always testing with the following file, it seems like this is crashing it while others seem to work. However, the point is why this file does not crash the other three generation methods:

SPDX2_time-1.9.tar.gz_concluded-1535482388-spdx.rdf.zip

What I did:

  • installed the branch on a vagrant instance
  • tested on some projects
  • installed an entirely new vagrant instance with this branch
  • tested a few files and few projects

-> all end up with a null pointer exception when I select "License Report as DOCX", all other tree options work. I guess there is some fundamental issue here

Stacktrace:

	at org.eclipse.sw360.licenseinfo.outputGenerators.DocxGenerator.generateOutputFile(DocxGenerator.java:42)
	at org.eclipse.sw360.licenseinfo.LicenseInfoHandler.getLicenseInfoFile(LicenseInfoHandler.java:132)
	at org.eclipse.sw360.datahandler.thrift.licenseinfo.LicenseInfoService$Processor$getLicenseInfoFile.getResult(LicenseInfoService.java:540)
	at org.eclipse.sw360.datahandler.thrift.licenseinfo.LicenseInfoService$Processor$getLicenseInfoFile.getResult(LicenseInfoService.java:525)
	at org.apache.thrift.ProcessFunction.process(ProcessFunction.java:39)
	at org.apache.thrift.TBaseProcessor.process(TBaseProcessor.java:39)
Dec 07, 2018 7:38:55 AM org.apache.catalina.core.StandardWrapperValve invoke
SEVERE: Servlet.service() for servlet [LicenseInfoService] in context with path [/licenseinfo] threw exception [java.lang.NullPointerException] with root cause
java.lang.NullPointerException
	at org.eclipse.sw360.licenseinfo.outputGenerators.DocxGenerator.fillOverview3rdPartyComponentTable(DocxGenerator.java:298)
	at org.eclipse.sw360.licenseinfo.outputGenerators.DocxGenerator.fillReportDocument(DocxGenerator.java:150)
	at org.eclipse.sw360.licenseinfo.outputGenerators.DocxGenerator.generateOutputFile(DocxGenerator.java:85)
	at org.eclipse.sw360.licenseinfo.outputGenerators.DocxGenerator.generateOutputFile(DocxGenerator.java:42)
	at org.eclipse.sw360.licenseinfo.LicenseInfoHandler.getLicenseInfoFile(LicenseInfoHandler.java:132)
	at org.eclipse.sw360.datahandler.thrift.licenseinfo.LicenseInfoService$Processor$getLicenseInfoFile.getResult(LicenseInfoService.java:540)
	at org.eclipse.sw360.datahandler.thrift.licenseinfo.LicenseInfoService$Processor$getLicenseInfoFile.getResult(LicenseInfoService.java:525)
	at org.apache.thrift.ProcessFunction.process(ProcessFunction.java:39)
	at org.apache.thrift.TBaseProcessor.process(TBaseProcessor.java:39)
	at org.apache.thrift.server.TServlet.doPost(TServlet.java:83)
	at org.eclipse.sw360.projects.Sw360ThriftServlet.doPost(Sw360ThriftServlet.java:42)
	at javax.servlet.http.HttpServlet.service(HttpServlet.java:650)
	at javax.servlet.http.HttpServlet.service(HttpServlet.java:731)
	at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:303)
	at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:208)
	at org.apache.tomcat.websocket.server.WsFilter.doFilter(WsFilter.java:52)
	at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:241)
	at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:208)
	at com.liferay.portal.kernel.servlet.filters.invoker.InvokerFilterChain.doFilter(InvokerFilterChain.java:116)
	at sun.reflect.GeneratedMethodAccessor1077.invoke(Unknown Source)
	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
	at java.lang.reflect.Method.invoke(Method.java:498)
	at com.liferay.portal.kernel.bean.ClassLoaderBeanHandler.invoke(ClassLoaderBeanHandler.java:67)
	at com.sun.proxy.$Proxy774.doFilter(Unknown Source)
	at com.liferay.portal.kernel.servlet.filters.invoker.InvokerFilterChain.doFilter(InvokerFilterChain.java:116)
	at com.liferay.portal.kernel.servlet.filters.invoker.InvokerFilterChain.processDirectCallFilter(InvokerFilterChain.java:165)
	at com.liferay.portal.kernel.servlet.filters.invoker.InvokerFilterChain.doFilter(InvokerFilterChain.java:96)
	at com.liferay.portal.kernel.servlet.PortalClassLoaderFilter.doFilter(PortalClassLoaderFilter.java:74)
	at com.liferay.portal.kernel.servlet.filters.invoker.InvokerFilterChain.processDoFilter(InvokerFilterChain.java:204)
	at com.liferay.portal.kernel.servlet.filters.invoker.InvokerFilterChain.doFilter(InvokerFilterChain.java:109)
	at com.liferay.portal.kernel.servlet.filters.invoker.InvokerFilter.doFilter(InvokerFilter.java:119)
	at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:241)
	at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:208)
	at org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:220)
	at org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:122)
	at org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:505)
	at org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:169)
	at org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:103)
	at org.apache.catalina.valves.AccessLogValve.invoke(AccessLogValve.java:956)
	at org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:116)
	at org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:423)
	at org.apache.coyote.http11.AbstractHttp11Processor.process(AbstractHttp11Processor.java:1079)
	at org.apache.coyote.AbstractProtocol$AbstractConnectionHandler.process(AbstractProtocol.java:625)
	at org.apache.tomcat.util.net.JIoEndpoint$SocketProcessor.run(JIoEndpoint.java:316)
	at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149)
	at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624)
	at org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61)
	at java.lang.Thread.run(Thread.java:748)

2018-12-07 07:38:55,201 ERROR ProjectPortlet:283 - Error getting LicenseInfo file for project with id a076c23e7e3e6d856428e1b547009662 and generator DocxGenerator::REPORT
 org.apache.thrift.transport.TTransportException: HTTP Response code: 500
	at org.apache.thrift.transport.THttpClient.flush(THttpClient.java:349)
	at org.apache.thrift.TServiceClient.sendBase(TServiceClient.java:73)
	at org.apache.thrift.TServiceClient.sendBase(TServiceClient.java:62)
	at org.eclipse.sw360.datahandler.thrift.licenseinfo.LicenseInfoService$Client.send_getLicenseInfoFile(LicenseInfoService.java:162)
	at org.eclipse.sw360.datahandler.thrift.licenseinfo.LicenseInfoService$Client.getLicenseInfoFile(LicenseInfoService.java:150)
	at org.eclipse.sw360.portal.portlets.projects.ProjectPortlet.downloadLicenseInfo(ProjectPortlet.java:278)
	at org.eclipse.sw360.portal.portlets.projects.ProjectPortlet.serveResource(ProjectPortlet.java:175)
	at com.liferay.portlet.FilterChainImpl.doFilter(FilterChainImpl.java:122)
	at com.liferay.portlet.ScriptDataPortletFilter.doFilter(ScriptDataPortletFilter.java:82)

This pull request adds:

- Reporting: Add to License Report List of 3rd Party Components eclipse-sw360#375
- Reporting: License report new structure: cover page eclipse-sw360#377
- Reporting: License report new proposed structure: Sections eclipse-sw360#378
- Reporting: License Report: Add Fixed Template Text eclipse-sw360#379
- Reporting: License Report: Add Editable Default Texts eclipse-sw360#380

closes eclipse-sw360#375
closes eclipse-sw360#377
closes eclipse-sw360#378
closes eclipse-sw360#379
closes eclipse-sw360#380

Signed-off-by: Johannes Amorosa <johannes.amorosa@endocode.com>
@mcjaeger
Copy link
Contributor

merging with bug: siemens#12

@mcjaeger mcjaeger merged commit 27bb79e into eclipse-sw360:master Dec 17, 2018
@dreh23 dreh23 deleted the johannesamorosa/#380 branch December 17, 2018 16:44
@maierthomas maierthomas removed the needs general test This is general testing, meaning that there is no org specific issue to check for label Jan 7, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants