Skip to content

Commit 2b268bf

Browse files
committed
Use common rather than v2 for effective config factory
1 parent 1e2f6c3 commit 2b268bf

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

model/src/main/java/oracle/kubernetes/weblogic/domain/model/Domain.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ public ServerSpec getAdminServerSpec() {
186186
}
187187

188188
private EffectiveConfigurationFactory getEffectiveConfigurationFactory() {
189-
return spec.getEffectiveConfigurationFactory(getResourceVersion());
189+
return spec.getEffectiveConfigurationFactory(apiVersion, getResourceVersion());
190190
}
191191

192192
private String getResourceVersion() {

model/src/main/java/oracle/kubernetes/weblogic/domain/model/DomainSpec.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -219,8 +219,9 @@ private AdminServer createAdminServer() {
219219
}
220220

221221
@SuppressWarnings("unused")
222-
EffectiveConfigurationFactory getEffectiveConfigurationFactory(String resourceVersionLabel) {
223-
return new V2EffectiveConfigurationFactory();
222+
EffectiveConfigurationFactory getEffectiveConfigurationFactory(
223+
String apiVersion, String resourceVersionLabel) {
224+
return new CommonEffectiveConfigurationFactory();
224225
}
225226

226227
/**
@@ -640,7 +641,7 @@ public List<Cluster> getClusters() {
640641
return clusters;
641642
}
642643

643-
class V2EffectiveConfigurationFactory implements EffectiveConfigurationFactory {
644+
class CommonEffectiveConfigurationFactory implements EffectiveConfigurationFactory {
644645
@Override
645646
public ServerSpec getAdminServerSpec() {
646647
return new AdminServerSpecCommonImpl(DomainSpec.this, adminServer);

0 commit comments

Comments
 (0)