Skip to content

Commit 9eb9b3b

Browse files
committed
Domain sync
1 parent 05b4a1b commit 9eb9b3b

File tree

52 files changed

+540
-269
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+540
-269
lines changed

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,23 +73,23 @@
7373
<dependency>
7474
<groupId>com.fasterxml.jackson.core</groupId>
7575
<artifactId>jackson-annotations</artifactId>
76-
<version>2.15.2</version>
76+
<version>2.15.3</version>
7777
<type>jar</type>
7878
<scope>compile</scope>
7979
<optional>false</optional>
8080
</dependency>
8181
<dependency>
8282
<groupId>com.fasterxml.jackson.core</groupId>
8383
<artifactId>jackson-core</artifactId>
84-
<version>2.15.2</version>
84+
<version>2.15.3</version>
8585
<type>jar</type>
8686
<scope>compile</scope>
8787
<optional>false</optional>
8888
</dependency>
8989
<dependency>
9090
<groupId>com.fasterxml.jackson.core</groupId>
9191
<artifactId>jackson-databind</artifactId>
92-
<version>2.15.2</version>
92+
<version>2.15.3</version>
9393
<type>jar</type>
9494
<scope>compile</scope>
9595
<optional>false</optional>

src/main/java/io/fusionauth/client/FusionAuthClient.java

Lines changed: 206 additions & 184 deletions
Large diffs are not rendered by default.

src/main/java/io/fusionauth/domain/CORSConfiguration.java

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2020, FusionAuth, All Rights Reserved
2+
* Copyright (c) 2020-2024, FusionAuth, All Rights Reserved
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@
2222
import java.util.Objects;
2323
import java.util.Set;
2424

25+
import com.inversoft.json.JacksonConstructor;
2526
import com.inversoft.json.ToString;
2627
import io.fusionauth.domain.util.HTTPMethod;
2728

@@ -43,6 +44,21 @@ public class CORSConfiguration extends Enableable implements Buildable<CORSConfi
4344

4445
public int preflightMaxAgeInSeconds;
4546

47+
@JacksonConstructor
48+
public CORSConfiguration() {
49+
}
50+
51+
public CORSConfiguration(CORSConfiguration other) {
52+
this.allowCredentials = other.allowCredentials;
53+
this.allowedHeaders.addAll(other.allowedHeaders);
54+
this.allowedMethods.addAll(other.allowedMethods);
55+
this.allowedOrigins.addAll(other.allowedOrigins);
56+
this.debug = other.debug;
57+
this.enabled = other.enabled;
58+
this.exposedHeaders.addAll(other.exposedHeaders);
59+
this.preflightMaxAgeInSeconds = other.preflightMaxAgeInSeconds;
60+
}
61+
4662
@Override
4763
public boolean equals(Object o) {
4864
if (this == o) {
@@ -73,4 +89,4 @@ public void normalize() {
7389
public String toString() {
7490
return ToString.toString(this);
7591
}
76-
}
92+
}

src/main/java/io/fusionauth/domain/CleanSpeakConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2018-2022, FusionAuth, All Rights Reserved
2+
* Copyright (c) 2018-2024, FusionAuth, All Rights Reserved
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

src/main/java/io/fusionauth/domain/EmailConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2019-2023, FusionAuth, All Rights Reserved
2+
* Copyright (c) 2019-2024, FusionAuth, All Rights Reserved
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

src/main/java/io/fusionauth/domain/Entity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2018, FusionAuth, All Rights Reserved
2+
* Copyright (c) 2018-2024, FusionAuth, All Rights Reserved
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

src/main/java/io/fusionauth/domain/KafkaConfiguration.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2018, FusionAuth, All Rights Reserved
2+
* Copyright (c) 2018-2024, FusionAuth, All Rights Reserved
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -27,6 +27,7 @@
2727
public class KafkaConfiguration extends Enableable implements Buildable<KafkaConfiguration>, Integration {
2828
public String defaultTopic;
2929

30+
// List of potentially sensitive configurations https://kafka.apache.org/documentation/#security_configclients
3031
public Map<String, String> producer = new TreeMap<>();
3132

3233
@Override
@@ -39,8 +40,8 @@ public boolean equals(Object o) {
3940
}
4041
KafkaConfiguration that = (KafkaConfiguration) o;
4142
return super.equals(o) &&
42-
Objects.equals(defaultTopic, that.defaultTopic) &&
43-
Objects.equals(producer, that.producer);
43+
Objects.equals(defaultTopic, that.defaultTopic) &&
44+
Objects.equals(producer, that.producer);
4445
}
4546

4647
@Override

src/main/java/io/fusionauth/domain/Key.java

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
11
/*
2-
* Copyright (c) 2019-2022, FusionAuth, All Rights Reserved
2+
* Copyright (c) 2019-2024, FusionAuth, All Rights Reserved
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing,
11+
* software distributed under the License is distributed on an
12+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
13+
* either express or implied. See the License for the specific
14+
* language governing permissions and limitations under the License.
315
*/
416
package io.fusionauth.domain;
517

src/main/java/io/fusionauth/domain/PasswordEncryptionConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2019, FusionAuth, All Rights Reserved
2+
* Copyright (c) 2019-2023, FusionAuth, All Rights Reserved
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

src/main/java/io/fusionauth/domain/SecureIdentity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2018-2023, FusionAuth, All Rights Reserved
2+
* Copyright (c) 2018-2024, FusionAuth, All Rights Reserved
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)