parent change

eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/config/SwaggerConfig.java

@@ -1,9 +1,11 @@
 package fi.vm.sade.eperusteet.config;
 
 import com.fasterxml.jackson.databind.type.SimpleType;
+import io.swagger.v3.core.converter.AnnotatedType;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.info.Info;
 import io.swagger.v3.oas.models.info.License;
+import io.swagger.v3.oas.models.media.Schema;
 import org.springdoc.core.customizers.PropertyCustomizer;
 import org.springdoc.core.models.GroupedOpenApi;
 import org.springframework.context.annotation.Bean;
@@ -28,15 +30,18 @@ public OpenAPI springShopOpenAPI() {
 
     @Bean
     public PropertyCustomizer enumPropertyCustomizer() {
-        return (schema, type) -> {
-            Type javaType = type.getType();
-            if (javaType instanceof SimpleType && ((SimpleType) javaType).isEnumType()) {
-                Class<?> enumClass = ((SimpleType)javaType).getRawClass();
-                schema.setEnum(Arrays.stream(enumClass.getEnumConstants())
-                        .map(enumConstant -> ((Enum<?>) enumConstant).name())
-                        .collect(Collectors.toList()));
+        return new PropertyCustomizer() {
+            @Override
+            public Schema customize(Schema schema, AnnotatedType type) {
+                Type javaType = type.getType();
+                if (javaType instanceof SimpleType && ((SimpleType) javaType).isEnumType()) {
+                    Class<?> enumClass = ((SimpleType) javaType).getRawClass();
+                    schema.setEnum(Arrays.stream(enumClass.getEnumConstants())
+                            .map(enumConstant -> ((Enum<?>) enumConstant).name())
+                            .collect(Collectors.toList()));
+                }
+                return schema;
             }
-            return schema;
         };
     }
 

eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/repository/dialect/JsonBType.java

@@ -37,24 +37,9 @@ public boolean equals(Object x, Object y) throws HibernateException {
         return Objects.equals(x, y);
     }
 
-//    @Override
-//    public Object nullSafeGet(ResultSet rs, String[] names, SharedSessionContractImplementor session, Object owner) throws HibernateException, SQLException {
-//        String str = rs.getString(names[0]);
-//        if (str != null) {
-//            try {
-//                JsonNode node = mapper.readTree(str);
-//                return node;
-//            } catch (IOException e) {
-//                throw new BusinessRuleViolationException("datan-luku-epaonnistui");
-//            }
-//        }
-//        return JsonNodeFactory.instance.objectNode();
-//    }
-
     @Override
     public void nullSafeSet(PreparedStatement st, Object value, int index, SharedSessionContractImplementor session) throws HibernateException, SQLException {
         if (value != null) {
-//            String jsonStr = gson.toJson(value);
             try {
                 String s = mapper.writeValueAsString(value);
                 st.setObject(index, s, Types.OTHER);