Quellcode durchsuchen

move support info to model package

tags/2.0.1
Jonathan Cobb vor 3 Jahren
Ursprung
Commit
09d23d287d
3 geänderte Dateien mit 9 neuen und 2 gelöschten Zeilen
  1. +5
    -1
      wizard-common/src/main/java/org/cobbzilla/wizard/model/support/BasicSupportInfo.java
  2. +3
    -1
      wizard-common/src/main/java/org/cobbzilla/wizard/model/support/SupportInfo.java
  3. +1
    -0
      wizard-server/src/main/java/org/cobbzilla/wizard/server/config/RestServerConfiguration.java

wizard-server/src/main/java/org/cobbzilla/wizard/server/config/BasicSupportInfo.java → wizard-common/src/main/java/org/cobbzilla/wizard/model/support/BasicSupportInfo.java Datei anzeigen

@@ -1,15 +1,19 @@
package org.cobbzilla.wizard.server.config;
package org.cobbzilla.wizard.model.support;

import lombok.Getter;
import lombok.Setter;
import org.cobbzilla.wizard.model.entityconfig.EntityFieldType;
import org.cobbzilla.wizard.model.entityconfig.annotations.ECField;

import static org.cobbzilla.util.daemon.ZillaRuntime.empty;

public class BasicSupportInfo {

@ECField(type=EntityFieldType.email)
@Getter @Setter private String email;
public boolean getHasEmail () { return !empty(email); }

@ECField(type=EntityFieldType.http_url)
@Getter @Setter private String site;
public boolean getHasSite () { return !empty(site); }


wizard-server/src/main/java/org/cobbzilla/wizard/server/config/SupportInfo.java → wizard-common/src/main/java/org/cobbzilla/wizard/model/support/SupportInfo.java Datei anzeigen

@@ -1,12 +1,14 @@
package org.cobbzilla.wizard.server.config;
package org.cobbzilla.wizard.model.support;

import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;

import java.util.HashMap;
import java.util.Map;

@Schema
public class SupportInfo extends BasicSupportInfo {

@JsonIgnore @Getter @Setter private Map<String, BasicSupportInfo> locale = new HashMap<>();

+ 1
- 0
wizard-server/src/main/java/org/cobbzilla/wizard/server/config/RestServerConfiguration.java Datei anzeigen

@@ -16,6 +16,7 @@ import org.cobbzilla.wizard.filters.ApiRateLimit;
import org.cobbzilla.wizard.log.LogRelayAppenderConfig;
import org.cobbzilla.wizard.model.Identifiable;
import org.cobbzilla.wizard.model.IdentifiableBase;
import org.cobbzilla.wizard.model.support.SupportInfo;
import org.cobbzilla.wizard.resources.ParentResource;
import org.cobbzilla.wizard.server.RestServer;
import org.cobbzilla.wizard.util.SpringUtil;


Laden…
Abbrechen
Speichern