#22468

Committed 03 Jun 2024 02:56PM UTC coverage: 20.58%. Remained the same

Build # #22468

Build Type

push

github

Committed by

web-flow

Commit Message

Allow merging of accounts that are members of the same group (#9909)

* Remove unused import

* Merge users with same groups

* Added additional line in Permalinks config

Added an additional line to restart Payara after changing settings in Permalinks section

* Revert "#9717 grant CREATE instead of ALL per pdurbin"

This reverts commit f71274e7c.

* CREATE instead of ALL for public schema

* Added: getZipDownloadLimit and getEmbargoEnabled API info endpoints

* Added: docs for new info API endpoints

* Fixed: missing guides reference in config.rst

* Changed: :MaxEmbargoDurationInMonths setting directly exposed via API info endpoint

* Changed: updated release notes

* Changed: private Info.java method renamed

* stub out page on API design, esp paths #9880

* remove embargo example, no longer used in #9881

* typo #9880

* Remove unused GPL-licensed code

For unknown reasons, in 2009 several files from the JDK were copied into
the Dataverse codebase, instead of referenced.
It appears that these classes weren't really used.

* Removed unused code

---------

Co-authored-by: Jérôme ROUCOU <jerome.roucou@inrae.fr>
Co-authored-by: Pradyumna Sridhara <95268690+prsridha@users.noreply.github.com>
Co-authored-by: Philip Durbin <philip_durbin@harvard.edu>
Co-authored-by: GPortas <hey@gportas.me>
Co-authored-by: bencomp <ben@companjen.name>
Co-authored-by: jeromeroucou <jeromeroucou@users.noreply.github.com>

Run Details

0 of 1 new or added line in 1 file covered. (0.0%)

2 existing lines in 2 files now uncovered.

17230 of 83724 relevant lines covered (20.58%)

0.21 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

80.88

/src/main/java/edu/harvard/iq/dataverse/actionlogging/ActionLogRecord.java

package edu.harvard.iq.dataverse.actionlogging;

import java.util.Date;
import java.util.Objects;
import java.util.UUID;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.EnumType;
import jakarta.persistence.Enumerated;
import jakarta.persistence.Id;
import jakarta.persistence.Index;
import jakarta.persistence.PrePersist;
import jakarta.persistence.Table;
import jakarta.persistence.Temporal;
import jakarta.persistence.TemporalType;

/**
 * Logs a single action in the action log.
 * @author michael
 */
@Entity
@Table(indexes = {@Index(columnList="useridentifier"), @Index(columnList="actiontype"), @Index(columnList="starttime")})
public class ActionLogRecord implements java.io.Serializable {
    
    public enum Result {
        OK, BadRequest, PermissionError, InternalError
    }
    
    public enum ActionType {
        /** login, logout */
        SessionManagement,
        
        /** Command execution */
        Command,
        
        BuiltinUser, 
        
        /** A setting being updated */
        Setting,
        
        Auth,
        
        Admin,

        ExternalTool,
        
        GlobalGroups
    }
    
    @Id
    @Column( length=36 )
    private String id;
    
    @Temporal(value = TemporalType.TIMESTAMP)
    private Date startTime;
    
    @Temporal(value = TemporalType.TIMESTAMP)
    private Date endTime;
    
    @Enumerated(EnumType.STRING)
    private Result actionResult;
    
    private String userIdentifier;
    
    @Enumerated(EnumType.STRING)
    private ActionType actionType;
    
    private String actionSubType;
    
    @Column(columnDefinition="TEXT")
    private String info;
    
    public ActionLogRecord(){}
    
    /**
     * @param anActionType
     * @param anActionSubType
     */
    // TODO: Add ability to set `info` in constructor.
    public ActionLogRecord( ActionType anActionType, String anActionSubType ) {
        actionType = anActionType;
        actionSubType = anActionSubType;
        startTime = new Date();
    }
    
    @Override
    public String toString() {
        return "[ActionLogRecord id:" + getId() + " type:" + getActionType() 
                    + "/" + getActionSubType()
                    + " result:" + getActionResult() + "]";
    }
    
    @PrePersist
    void prepresist() {
        if ( id == null ) {
            id = UUID.randomUUID().toString();
        }
    }

    public String getId() {
        return id;
    }

    public void setId(String id) {
        this.id = id;
    }

    public Date getStartTime() {
        return startTime;
    }

    public ActionLogRecord setStartTime(Date startTime) {
        this.startTime = startTime;
        return this;
    }

    public Date getEndTime() {
        return endTime;
    }

    public ActionLogRecord setEndTime(Date endTime) {
        this.endTime = endTime;
        return this;
    }

    public Result getActionResult() {
        return actionResult;
    }

    public ActionLogRecord setActionResult(Result actionResult) {
        this.actionResult = actionResult;
        return this;
    }

    public String getUserIdentifier() {
        return userIdentifier;
    }

    public ActionLogRecord setUserIdentifier(String userIdentifier) {
        this.userIdentifier = userIdentifier;
        return this;
    }

    public ActionType getActionType() {
        return actionType;
    }

    public ActionLogRecord setActionType(ActionType actionType) {
        this.actionType = actionType;
        return this;
    }

    public String getActionSubType() {
        return actionSubType;
    }

    public ActionLogRecord setActionSubType(String actionSubType) {
        this.actionSubType = actionSubType;
        return this;
    }

    public String getInfo() {
        return info;
    }

    public ActionLogRecord setInfo(String info) {
        this.info = info;
        return this;
    }

    @Override
    public int hashCode() {
        int hash = 7;
        hash = 71 * hash + Objects.hashCode(this.id);
        return hash;
    }

    @Override
    public boolean equals(Object obj) {
        if (obj == null) {
            return false;
        }
        if (getClass() != obj.getClass()) {
            return false;
        }
        final ActionLogRecord other = (ActionLogRecord) obj;
        if (!Objects.equals(this.startTime, other.startTime)) {
            return false;
        }
        if (!Objects.equals(this.endTime, other.endTime)) {
            return false;
        }
        if (this.actionResult != other.actionResult) {
            return false;
        }
        if (!Objects.equals(this.userIdentifier, other.userIdentifier)) {
            return false;
        }
        if (this.actionType != other.actionType) {
            return false;
        }
        if (!Objects.equals(this.actionSubType, other.actionSubType)) {
            return false;
        }
        return Objects.equals(this.info, other.info);
    }
    
    
    
}

1	package edu.harvard.iq.dataverse.actionlogging;
2
3	import java.util.Date;
4	import java.util.Objects;
5	import java.util.UUID;
6	import jakarta.persistence.Column;
7	import jakarta.persistence.Entity;
8	import jakarta.persistence.EnumType;
9	import jakarta.persistence.Enumerated;
10	import jakarta.persistence.Id;
11	import jakarta.persistence.Index;
12	import jakarta.persistence.PrePersist;
13	import jakarta.persistence.Table;
14	import jakarta.persistence.Temporal;
15	import jakarta.persistence.TemporalType;
16
17	/**
18	* Logs a single action in the action log.
19	* @author michael
20	*/
21	@Entity
22	@Table(indexes = {@Index(columnList="useridentifier"), @Index(columnList="actiontype"), @Index(columnList="starttime")})
23	public class ActionLogRecord implements java.io.Serializable {
24
25	public enum Result {	1✔
26	OK, BadRequest, PermissionError, InternalError	1✔
27	}
28
29	public enum ActionType {	1✔
30	/** login, logout */
31	SessionManagement,	1✔
32
33	/** Command execution */
34	Command,	1✔
35
36	BuiltinUser,	1✔
37
38	/** A setting being updated */
39	Setting,	1✔
40
41	Auth,	1✔
42
43	Admin,	1✔
44
45	ExternalTool,	1✔
46
47	GlobalGroups	1✔
48	}
49
50	@Id
51	@Column( length=36 )
52	private String id;
53
54	@Temporal(value = TemporalType.TIMESTAMP)
55	private Date startTime;
56
57	@Temporal(value = TemporalType.TIMESTAMP)
58	private Date endTime;
59
60	@Enumerated(EnumType.STRING)
61	private Result actionResult;
62
63	private String userIdentifier;
64
65	@Enumerated(EnumType.STRING)
66	private ActionType actionType;
67
68	private String actionSubType;
69
70	@Column(columnDefinition="TEXT")
71	private String info;
72
73	public ActionLogRecord(){}	1✔
74
75	/**
76	* @param anActionType
77	* @param anActionSubType
78	*/
79	// TODO: Add ability to set `info` in constructor.
80	public ActionLogRecord( ActionType anActionType, String anActionSubType ) {	1✔
81	actionType = anActionType;	1✔
82	actionSubType = anActionSubType;	1✔
83	startTime = new Date();	1✔
84	}	1✔
85
86	@Override
87	public String toString() {
88	return "[ActionLogRecord id:" + getId() + " type:" + getActionType()	×
89	+ "/" + getActionSubType()	×
90	+ " result:" + getActionResult() + "]";	×
91	}
92
93	@PrePersist
94	void prepresist() {
95	if ( id == null ) {	×
96	id = UUID.randomUUID().toString();	×
97	}
98	}	×
99
100	public String getId() {
101	return id;	×
102	}
103
104	public void setId(String id) {
105	this.id = id;	×
106	}	×
107
108	public Date getStartTime() {
109	return startTime;	1✔
110	}
111
112	public ActionLogRecord setStartTime(Date startTime) {
113	this.startTime = startTime;	1✔
114	return this;	1✔
115	}
116
117	public Date getEndTime() {
118	return endTime;	1✔
119	}
120
121	public ActionLogRecord setEndTime(Date endTime) {
122	this.endTime = endTime;	1✔
123	return this;	1✔
124	}
125
126	public Result getActionResult() {
127	return actionResult;	1✔
128	}
129
130	public ActionLogRecord setActionResult(Result actionResult) {
131	this.actionResult = actionResult;	1✔
132	return this;	1✔
133	}
134
135	public String getUserIdentifier() {
136	return userIdentifier;	1✔
137	}
138
139	public ActionLogRecord setUserIdentifier(String userIdentifier) {
140	this.userIdentifier = userIdentifier;	1✔
141	return this;	1✔
142	}
143
144	public ActionType getActionType() {
145	return actionType;	1✔
146	}
147
148	public ActionLogRecord setActionType(ActionType actionType) {
149	this.actionType = actionType;	1✔
150	return this;	1✔
151	}
152
153	public String getActionSubType() {
154	return actionSubType;	1✔
155	}
156
157	public ActionLogRecord setActionSubType(String actionSubType) {
158	this.actionSubType = actionSubType;	1✔
159	return this;	1✔
160	}
161
162	public String getInfo() {
163	return info;	1✔
164	}
165
166	public ActionLogRecord setInfo(String info) {
167	this.info = info;	1✔
168	return this;	1✔
169	}
170
171	@Override
172	public int hashCode() {
173	int hash = 7;	×
174	hash = 71 * hash + Objects.hashCode(this.id);	×
175	return hash;	×
176	}
177
178	@Override
179	public boolean equals(Object obj) {
180	if (obj == null) {	1✔
181	return false;	1✔
182	}
183	if (getClass() != obj.getClass()) {	1✔
184	return false;	1✔
185	}
186	final ActionLogRecord other = (ActionLogRecord) obj;	1✔
187	if (!Objects.equals(this.startTime, other.startTime)) {	1✔
UNCOV 188	return false;	×
189	}
190	if (!Objects.equals(this.endTime, other.endTime)) {	1✔
191	return false;	1✔
192	}
193	if (this.actionResult != other.actionResult) {	1✔
194	return false;	1✔
195	}
196	if (!Objects.equals(this.userIdentifier, other.userIdentifier)) {	1✔
197	return false;	1✔
198	}
199	if (this.actionType != other.actionType) {	1✔
200	return false;	1✔
201	}
202	if (!Objects.equals(this.actionSubType, other.actionSubType)) {	1✔
203	return false;	1✔
204	}
205	return Objects.equals(this.info, other.info);	1✔
206	}
207
208
209
210	}

IQSS / dataverse / #22468

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous